From f28df64de9c99bb58ff49272d75c983efa435da2 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 1 Jul 2005 15:49:43 +0000 Subject: [PATCH] I found several build issues, mostly related to building outside of the source tree. Below/attached adjustments for these. Signed-off-by: Jan Beulich --- .../arch/xen/i386/kernel/Makefile | 5 ++-- .../arch/xen/x86_64/kernel/Makefile | 11 ++++---- .../arch/xen/x86_64/kernel/acpi/Makefile | 8 ++++-- .../arch/xen/x86_64/pci/Makefile | 27 +++++++++---------- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile index 6973df049f..273a4b9f44 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile @@ -84,12 +84,13 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE c-link := init_task.o s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o -$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): +$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): @ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@ $(obj)/vsyscall-int80.S: $(obj)/vsyscall-sigreturn.S obj-y += $(c-obj-y) $(s-obj-y) +obj-m += $(c-obj-m) -clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link)) +clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-m) $(c-obj-) $(c-link)) clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link)) diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile index 63c89d7f23..c340cf6b45 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile @@ -22,7 +22,7 @@ s-obj-y := #obj-$(CONFIG_X86_MCE) += mce.o #obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ obj-$(CONFIG_ACPI_BOOT) += acpi/ -obj-$(CONFIG_X86_MSR) += msr.o +c-obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o #obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o @@ -55,13 +55,14 @@ quirks-y += ../../../i386/kernel/quirks.o c-link := init_task.o s-link := vsyscall.o -$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): - ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@ +$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): + @ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@ $(patsubst %.o,$(obj)/%.c,$(i386-obj-y)): - ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@ + @ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@ obj-y += $(c-obj-y) $(s-obj-y) $(i386-obj-y) +obj-m += $(c-obj-m) -clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link) $(i386-obj-y)) +clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-m) $(c-obj-) $(c-link) $(i386-obj-y)) clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link)) diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile index 0824a570e6..ef8ec506c8 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile @@ -1,14 +1,18 @@ i386-obj-$(CONFIG_ACPI_BOOT) := boot.o c-obj-$(CONFIG_X86_IO_APIC) := earlyquirk.o -c-obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o +c-obj-$(CONFIG_ACPI_SLEEP) += sleep.o +s-obj-$(CONFIG_ACPI_SLEEP) += wakeup.o c-link := $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)): @ln -fsn $(srctree)/arch/i386/kernel/acpi/$(notdir $@) $@ +$(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): + @ln -fsn $(srctree)/arch/x86_64/kernel/acpi/$(notdir $@) $@ + $(patsubst %.o,$(obj)/%.c,$(i386-obj-y)): - ln -fsn $(srctree)/arch/xen/i386/kernel/acpi/$(notdir $@) $@ + @ln -fsn $(srctree)/arch/xen/i386/kernel/acpi/$(notdir $@) $@ obj-y += $(c-obj-y) $(s-obj-y) $(i386-obj-y) diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile index 47dbc45daa..811fa0f200 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile @@ -8,34 +8,31 @@ CFLAGS += -Iarch/$(XENARCH)/pci CFLAGS += -Iarch/i386/pci -c-obj-y := i386.o -c-obj-y += fixup.o -c-obj-$(CONFIG_ACPI_PCI) += acpi.o -c-obj-y += legacy.o common.o -c-obj-$(CONFIG_PCI_DIRECT)+= direct.o +c-i386-obj-y := i386.o +c-i386-obj-y += fixup.o +c-i386-obj-$(CONFIG_ACPI_PCI) += acpi.o +c-i386-obj-y += legacy.o common.o +c-i386-obj-$(CONFIG_PCI_DIRECT)+= direct.o c-xen-obj-y += irq.o # mmconfig has a 64bit special c-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o c-obj-$(CONFIG_NUMA) += k8-bus.o -c-direct-y += ../../i386/pci/direct.o -c-acpi-y += ../../i386/pci/acpi.o -c-legacy-y += ../../i386/pci/legacy.o -c-irq-y += ../../i386/pci/irq.o -c-common-y += ../../i386/pci/common.o -c-fixup-y += ../../i386/pci/fixup.o -c-i386-y += ../../i386/pci/i386.o - c-link := -$(patsubst %.o,$(obj)/%.c,$(c-xen-obj-y) $(c-link)): +$(patsubst %.o,$(obj)/%.c,$(c-xen-obj-y)): @ln -fsn $(srctree)/arch/xen/i386/pci/$(notdir $@) $@ $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)): + @ln -fsn $(srctree)/arch/x86_64/pci/$(notdir $@) $@ + +$(patsubst %.o,$(obj)/%.c,$(c-i386-obj-y)): @ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@ -obj-y += $(c-obj-y) +obj-y += $(c-i386-obj-y) $(c-obj-y) obj-y += $(c-xen-obj-y) clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link)) +clean-files += $(patsubst %.o,%.c,$(c-i386-obj-y) $(c-i386-obj-)) +clean-files += $(patsubst %.o,%.c,$(c-xen-obj-y) $(c-xen-obj-)) -- 2.30.2